[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205#46
Merged
mssonicbld merged 2 commits intoAzure:202205from Jun 24, 2023
Merged
Conversation
Collaborator
mssonicbld
commented
Jun 24, 2023
mssonicbld
commented
…E platform (#15605) Signed-off-by: mlok <marty.lok@nokia.com> (cherry picked from commit 478ba478f5aaea347d36bc22021e0c5ab7e7e39b)
jon-nokia
pushed a commit
to jon-nokia/sonic-buildimage-msft
that referenced
this pull request
Jul 5, 2023
…cause file removal issue (sonic-host-services Azure#46) (#14106) Why I did it Porting/cherry-pick PR sonic-net/sonic-host-services#46 "show reboot-cause history" shows empty history. When the previous-reboot-cause has a broken symlink, And rebooting the system will not be able to generate a new symlink of the new previous-reboot-cause. admin@sonic:~$ show reboot-cause history Name Cause Time User Comment ------ ------- ------ ------ --------- How I did it Somehow, when the symlink file /host/reboot-cause/previous-reboot-cause is broken (which its destination files doesn't exist in this case), the current condition check "if os.path,exists(PREVIOUS_REBOOT_CAUSE_FILE)" will return False in determine-reboot-cause script. Hence, the current previous-reboot-cause is not been removed and the recreation of the new previous-reboot-cause failed. In case of previous-reboot-cause is a broken synlink file, add condition os.path.islink(PREVIOUS_REBOOT_CAUSE) to check and allow the remove operation happens. How to verify it Manually make the /host/reboot-cause/previous-reboot-cause to be a broken symlink file by removing its destination file reboot the system. "show reboot-cause history" should show the correct info Signed-off-by: mlok <marty.lok@nokia.com>
jon-nokia
pushed a commit
to jon-nokia/sonic-buildimage-msft
that referenced
this pull request
May 3, 2024
…ly (#18046) #### Why I did it src/dhcprelay ``` * 363fa06 - (HEAD -> master, origin/master, origin/HEAD) Skip vlans with no dhcpv6 server configured (Azure#46) (8 hours ago) [kellyyeh] ``` #### How I did it #### How to verify it #### Description for the changelog
mssonicbld
added a commit
that referenced
this pull request
Feb 28, 2025
…lly (#731) #### Why I did it src/sonic-swss ``` * b87da49 - (HEAD -> 202412, origin/202412) Set Port UPDATE_DSCP attribute when TC_TO_DSCP map is attached (#44) (9 hours ago) [mssonicbld] * 8c99374 - sonic-swss: Code changes for WRED and ECN statistics (#46) (9 hours ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
mssonicbld
added a commit
that referenced
this pull request
Mar 4, 2025
… automatically (#768) #### Why I did it src/sonic-platform-common ``` * 44faed9 - (HEAD -> 202412, origin/202412) [code sync] Merge code from sonic-net/sonic-platform-common:202411 to 202412 (#46) (21 hours ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
mssonicbld
added a commit
that referenced
this pull request
Apr 18, 2025
…D automatically (#1025) #### Why I did it src/sonic-sairedis ``` * 08c1e34 - (HEAD -> 202412, origin/HEAD, origin/202412) Merge pull request #46 from r12f/user/riffjiang/fix-merge (31 minutes ago) [Riff] * a49942e - Revert "Merge pull request #45 from r12f/code-sync-202412" (38 minutes ago) [r12f] ``` #### How I did it #### How to verify it #### Description for the changelog
prabhataravind
pushed a commit
that referenced
this pull request
Jul 7, 2025
…ly (#21743) #### Why I did it src/sonic-stp ``` * 29eb387 - (HEAD -> master, origin/master, origin/HEAD) Fixing compilaion error for marvell_armhf (#47) (9 hours ago) [Divya Kumaran Chandralekha] * b7da558 - Merge pull request #44 from wajahatrazi/stp_co_pr (3 days ago) [Divya Kumaran Chandralekha] |\ | failure_prs.log skip_prs.log 47e1e77 - Merge branch 'master' into stp_co_pr (3 days ago) [Divya Kumaran Chandralekha] | |\ | |/ |/| * | 6e4a94f - Merge pull request #46 from divyachandralekha/pvst_pr_1 (4 days ago) [Divya Kumaran Chandralekha] |\ \ | failure_prs.log skip_prs.log | aa5e824 - libevent explicit building dependency removed (4 days ago) [Divya Chandralekha] |/ / * | 9345e5a - Merge pull request #43 from omaaartamer/fix/alignment-warnings (5 days ago) [Divya Kumaran Chandralekha] * | eedb772 - [stp] Add memory alignment padding to structures (9 weeks ago) [omaaartamer] * | 128e53d - fix: resolve STP alignment warnings (9 weeks ago) [omaaartamer] / * 30febfa - Fixing changes in the code (9 weeks ago) [Wajahat Razi] ``` #### How I did it #### How to verify it #### Description for the changelog
mssonicbld
added a commit
that referenced
this pull request
Jul 20, 2025
… HEAD automatically (#1381) #### Why I did it src/sonic-linux-kernel ``` * 8011b4f - (HEAD -> 202503, origin/202503) Merge pull request #49 from mssonicbld/sonicbld/202503-merge (23 hours ago) [mssonicbld] * 41945c5 - Merge branch '202412' of https://github.com/Azure/sonic-linux-kernel.msft into 202503 (23 hours ago) [Sonic Automation] * 7f3e021 - (origin/HEAD, origin/202412, 202412) Integrate HW-MGMT 7.0040.4019 Changes (#46) (30 hours ago) [Vivek] ``` #### How I did it #### How to verify it #### Description for the changelog
prabhataravind
added a commit
that referenced
this pull request
Jul 22, 2025
…HEAD automatically (#1377) #### Why I did it src/sonic-swss-common ``` * 0ba9ae7 - (HEAD -> 202506, origin/202506) [azp] Only grab libyang v1 libs for AZP jobs (#46) (4 hours ago) [mssonicbld] * 555cc66 - Add DASH port map table names (#47) (4 hours ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
bingwang-ms
pushed a commit
that referenced
this pull request
Jan 16, 2026
… (#23654) #### Why I did it src/dhcpmon ``` * 1cb6ced - (HEAD -> master, origin/master, origin/HEAD) Update clear_counter_timeout to fix clear counter issue (#45) (19 hours ago) [Yaqiang Zhu] * 848304e - [build] Update to use libyang3 (#46) (4 days ago) [Yaqiang Zhu] ``` #### How I did it #### How to verify it #### Description for the changelog
liushilongbuaa
pushed a commit
that referenced
this pull request
Mar 25, 2026
…tically (#23416) #### Why I did it src/sonic-dash-api ``` * aa3fc48 - (HEAD -> master, origin/master, origin/HEAD) [ci] Automated agent pool migration for branch master (#46) (3 days ago) [yijingyan2] ``` #### How I did it #### How to verify it #### Description for the changelog
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.